chore(format): update google-java-format to 1.25.2 via java-shared-config update#3726
Merged
diegomarquezp merged 35 commits intomainfrom Apr 2, 2025
Merged
chore(format): update google-java-format to 1.25.2 via java-shared-config update#3726diegomarquezp merged 35 commits intomainfrom
diegomarquezp merged 35 commits intomainfrom
Conversation
this is the groupId used from version 2.13 onwards
1 task
This reverts commit c824163.
…gleapis/sdk-platform-java into update-sharedconfig-and-lint
this upgrades java 11 to 17
JoeWang1127
approved these changes
Mar 31, 2025
blakeli0
reviewed
Mar 31, 2025
| name: Hermetic library generation upon generation config change through pull requests | ||
| on: | ||
| pull_request: | ||
| # TODO: uncomment this before merging to prevent a formatting regression |
Contributor
There was a problem hiding this comment.
This need to be uncommented now?
Contributor
Author
There was a problem hiding this comment.
I will uncomment it right after restoring the formatted files. I'll cancel the job once the CIs start.
Contributor
There was a problem hiding this comment.
What is library_generation_airlock.Dockerfile used for? What is the difference between it and library_generation.Dockerfile?
Contributor
Author
There was a problem hiding this comment.
It's a Airlock variant of our Dockerfile. It was introduced in #3472 and it seemingly is a reflection of the original one, but fetching the images from Airlock (this is compatible with Cloud Build).
Contributor
There was a problem hiding this comment.
We should probably have a way to share the common code between the two, or maybe only keep the airlock one if it can be used locally as well. Otherwise these two files can easily get diverged from each other as they evolve. This is a separate future enhancement though.
blakeli0
approved these changes
Apr 1, 2025
suztomo
approved these changes
Apr 1, 2025
…-and-lint' into update-sharedconfig-and-lint
reverts part of ce51ccb
diegomarquezp
added
the
automerge
|
|
lqiu96
pushed a commit
that referenced
this pull request
Jun 10, 2025
…nfig update (#3726) [Context Doc](https://docs.google.com/document/d/1Fqb4lXZ0FEpkJoSUvUp7Ow-z0fdcLyLE30lDDsGaRY0/edit?resourcekey=0-IueNnA7qMxmyWH6bGE9bsw&tab=t.0#heading=h.pi1uh78box27) This replaces #3724 in order to manually prepare the repo for this update. The preparation includes: - Update google-cloud-shared-config to `1.15.1`. - Configure pom.xml files to reference the `fmt` plugin using the `com.spotify.fmt` groupId instead of `com.coveo`. The group ID in [since 2022](https://github.com/spotify/fmt-maven-plugin/blame/main/README.md#L7). Some pom.xml explicitly referenced the `2.9.1` version, but I removed it so it's [controlled by google-cloud-shared-config](https://github.com/googleapis/java-shared-config/blob/bc8f22d02511c0467271698acf340874ed987160/java-shared-config/pom.xml#L172-L174). - Update our `ci.yaml` to either run the `mvn` tasks using java 17 or running the task with the `-Dfmt.skip` flag. - Update `java_compatibility_check.yaml` from java 11 to java 17. - Update our docker image to use java 17 instead of 11. - Format the codebase using `mvn fmt:format` (see 36d9ee4 for format changes). ### Review instructions You will see that the checks are failing because I did not include file formatting in the latest commit of this PR for the sake of browser performance. However, I ran the checks in 36d9ee4 with formatted files and they were all green except for the integration test, which is failing because I haven't updated the golden branch (see [this branch comparison](googleapis/google-cloud-java@chore/test-hermetic-build...chore/test-hermetic-build-update-sharedconfig-and-lint) for upcoming changes), which I plan to do before merging this PR. #### Before merging: - [x] Update golden branch - [x] Restore hermetic_library_generation workflow - [x] Restore formatted java files --------- Co-authored-by: Mend Renovate <bot@renovateapp.com> Co-authored-by: cloud-java-bot <cloud-java-bot@google.com>
lqiu96
pushed a commit
that referenced
this pull request
Aug 21, 2025
…nfig update (#3726) [Context Doc](https://docs.google.com/document/d/1Fqb4lXZ0FEpkJoSUvUp7Ow-z0fdcLyLE30lDDsGaRY0/edit?resourcekey=0-IueNnA7qMxmyWH6bGE9bsw&tab=t.0#heading=h.pi1uh78box27) This replaces #3724 in order to manually prepare the repo for this update. The preparation includes: - Update google-cloud-shared-config to `1.15.1`. - Configure pom.xml files to reference the `fmt` plugin using the `com.spotify.fmt` groupId instead of `com.coveo`. The group ID in [since 2022](https://github.com/spotify/fmt-maven-plugin/blame/main/README.md#L7). Some pom.xml explicitly referenced the `2.9.1` version, but I removed it so it's [controlled by google-cloud-shared-config](https://github.com/googleapis/java-shared-config/blob/bc8f22d02511c0467271698acf340874ed987160/java-shared-config/pom.xml#L172-L174). - Update our `ci.yaml` to either run the `mvn` tasks using java 17 or running the task with the `-Dfmt.skip` flag. - Update `java_compatibility_check.yaml` from java 11 to java 17. - Update our docker image to use java 17 instead of 11. - Format the codebase using `mvn fmt:format` (see 36d9ee4 for format changes). ### Review instructions You will see that the checks are failing because I did not include file formatting in the latest commit of this PR for the sake of browser performance. However, I ran the checks in 36d9ee4 with formatted files and they were all green except for the integration test, which is failing because I haven't updated the golden branch (see [this branch comparison](googleapis/google-cloud-java@chore/test-hermetic-build...chore/test-hermetic-build-update-sharedconfig-and-lint) for upcoming changes), which I plan to do before merging this PR. #### Before merging: - [x] Update golden branch - [x] Restore hermetic_library_generation workflow - [x] Restore formatted java files --------- Co-authored-by: Mend Renovate <bot@renovateapp.com> Co-authored-by: cloud-java-bot <cloud-java-bot@google.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Context Doc
This replaces #3724 in order to manually prepare the repo for this update. The preparation includes:
1.15.1.fmtplugin using thecom.spotify.fmtgroupId instead ofcom.coveo. The group ID in since 2022. Some pom.xml explicitly referenced the2.9.1version, but I removed it so it's controlled by google-cloud-shared-config.ci.yamlto either run themvntasks using java 17 or running the task with the-Dfmt.skipflag.java_compatibility_check.yamlfrom java 11 to java 17.mvn fmt:format(see 36d9ee4 for format changes).Review instructions
You will see that the checks are failing because I did not include file formatting in the latest commit of this PR for the sake of browser performance. However, I ran the checks in 36d9ee4 with formatted files and they were all green except for the integration test, which is failing because I haven't updated the golden branch (see this branch comparison for upcoming changes), which I plan to do before merging this PR.
Before merging: